Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Fri, 19 Feb 2010 13:11:21 +0000 (14:11 +0100)
committerJan D. <jan.h.d@swipnet.se>
Fri, 19 Feb 2010 13:11:21 +0000 (14:11 +0100)

Trivial merge